Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Translate spatial aggregates #28115

Merged
1 commit merged into from
Jun 21, 2022
Merged

Translate spatial aggregates #28115

1 commit merged into from
Jun 21, 2022

Conversation

roji
Copy link
Member

@roji roji commented May 27, 2022

Closes #13278

@roji roji requested review from bricelam and smitpatel May 27, 2022 12:55
@roji roji mentioned this pull request May 27, 2022
Closed
smitpatel
smitpatel reviewed May 27, 2022
View reviewed changes
src/EFCore.Sqlite.NTS/Query/Internal/SqliteNetTopologySuiteAggregateMethodTranslator.cs
IDiagnosticsLogger<DbLoggerCategory.Query> logger)
{
if (source.Selector is not SqlExpression sqlExpression
|| (method != GeometryCombineMethod && method != UnionMethod && method != ConvexHullMethod))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why use different patterns in 2 providers in same PR. 😉

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only because in SQLite we need to compose the additional Collect before doing ST_ConvexHull...

@smitpatel
Copy link
Member

Amazing. 🎉

@roji
Copy link
Member Author

roji commented May 27, 2022

Amazing.

Yeah, it's really nice to see this working - thanks for doing all the infra for it!

bricelam
bricelam suggested changes May 27, 2022
View reviewed changes
Copy link
Contributor

@bricelam bricelam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So cool to see this. EF6 never had them!

src/EFCore.SqlServer.NTS/Query/Internal/SqlServerNetTopologySuiteAggregateMethodTranslator.cs Show resolved Hide resolved
src/EFCore.SqlServer.NTS/Query/Internal/SqlServerNetTopologySuiteAggregateMethodTranslator.cs Show resolved Hide resolved
...SqlServer.NTS/Query/Internal/SqlServerNetTopologySuiteAggregateMethodCallTranslatorPlugin.cs Outdated Show resolved Hide resolved
src/EFCore.Sqlite.NTS/Query/Internal/SqliteNetTopologySuiteAggregateMethodTranslator.cs Outdated Show resolved Hide resolved
src/EFCore.Sqlite.NTS/Query/Internal/SqliteNetTopologySuiteAggregateMethodTranslator.cs Show resolved Hide resolved
src/EFCore.Sqlite.NTS/Query/Internal/SqliteNetTopologySuiteAggregateMethodTranslator.cs Show resolved Hide resolved
test/EFCore.Specification.Tests/Query/SpatialQueryTestBase.cs Show resolved Hide resolved
test/EFCore.Specification.Tests/Query/SpatialQueryTestBase.cs Outdated Show resolved Hide resolved
test/EFCore.SqlServer.FunctionalTests/Query/SpatialQuerySqlServerGeographyTest.cs Outdated Show resolved Hide resolved
@roji
Copy link
Member Author

roji commented May 27, 2022

FYI corresponding support for PostGIS: npgsql/efcore.pg@f77330d

@roji
Copy link
Member Author

roji commented May 27, 2022

@smitpatel will hold off merging for a bit in case you have further comments.

@roji
Copy link
Member Author

roji commented May 28, 2022

BTW @bricelam PostGIS has a few more spatial aggregate functions: https://postgis.net/docs/PostGIS_Special_Functions_Index.html#PostGIS_Aggregate_Functions

@roji
Copy link
Member Author

roji commented Jun 4, 2022

FYI holding off merging this until we decide on top-level aggregate strategy, as per #28104 (comment).

@roji roji mentioned this pull request Jun 5, 2022
Closed
4 tasks
@roji
Copy link
Member Author

roji commented Jun 18, 2022

@smitpatel now that we've excluded top-level aggregates (#28264), I think we can come back to this (@bricelam approved for the spatial side but maybe you have comments on the query aggregate side).

smitpatel
smitpatel reviewed Jun 20, 2022
View reviewed changes
src/EFCore.SqlServer.NTS/Query/Internal/SqlServerNetTopologySuiteAggregateMethodTranslator.cs Outdated
nullable: true,
argumentsPropagateNullability: new[] { false },
typeof(Geometry),
_typeMappingSource.FindMapping(typeof(Geometry), storeType));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Validate that sqlExpression has TypeMapping assigned (like other method/member translators in NTS. If you want to default fallback to geometry then assign the type mapping to sqlExpression first and then just propagate here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, done. Note that I still look up the return type mapping since the sqlExpression's mapping may be for a specific geometry type (e.g. Point), but the aggregate methods return Geometry and the CLR type won't match.

@roji roji requested a review from smitpatel June 21, 2022 14:52
smitpatel
smitpatel reviewed Jun 21, 2022
View reviewed changes
src/Shared/Check.cs Outdated
[Conditional("DEBUG")]
[DoesNotReturn]
public static void DebugFail(string message)
=> throw new Exception($"Check.DebugAssert failed: {message}");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Message points to DebugAssert :/

@ghost
Copy link

ghost commented Jun 21, 2022

Hello @roji!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost
Copy link

ghost commented Jun 21, 2022

Apologies, while this PR appears ready to be merged, I've been configured to only merge when all checks have explicitly passed. The following integrations have not reported any progress on their checks and are blocking auto-merge:

  1. Azure Pipelines

These integrations are possibly never going to report a check, and unblocking auto-merge likely requires a human being to update my configuration to exempt these integrations from requiring a passing check.

Give feedback on this
From the bot dev team

We've tried to tune the bot such that it posts a comment like this only when auto-merge is blocked for exceptional, non-intuitive reasons. When the bot's auto-merge capability is properly configured, auto-merge should operate as you would intuitively expect and you should not see any spurious comments.

Please reach out to us at fabricbotservices@microsoft.com to provide feedback if you believe you're seeing this comment appear spuriously. Please note that we usually are unable to update your bot configuration on your team's behalf, but we're happy to help you identify your bot admin.

@ghost ghost merged commit e257d1d into dotnet:main Jun 21, 2022
@roji roji deleted the SpatialAggregates branch June 21, 2022 18:59
@ajcvickers ajcvickers mentioned this pull request Jun 23, 2022
Closed
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bricelam bricelam bricelam approved these changes

@smitpatel smitpatel smitpatel approved these changes

Assignees
No one assigned
Labels
auto-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Spatial: Translate aggregate functions
3 participants
@roji @smitpatel @bricelam